Auto merge of #2185 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 30 Nov 2015 23:02:48 +0000 (23:02 +0000)
committerbors <bors@rust-lang.org>
Mon, 30 Nov 2015 23:02:48 +0000 (23:02 +0000)

Trivial merge